From 3352268c6cd08aba8e8e97efa5e7e8786f7ce006 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 28 Mar 2007 13:55:01 +0100 Subject: [PATCH] pciback: check function return values of functions declared with __must_check post-2.6.18. Signed-off-by: Jan Beulich --- .../drivers/xen/pciback/conf_space_header.c | 14 ++++- .../drivers/xen/pciback/pci_stub.c | 51 ++++++++++++------- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/pciback/conf_space_header.c b/linux-2.6-xen-sparse/drivers/xen/pciback/conf_space_header.c index 61089c6a50..c28962133d 100644 --- a/linux-2.6-xen-sparse/drivers/xen/pciback/conf_space_header.c +++ b/linux-2.6-xen-sparse/drivers/xen/pciback/conf_space_header.c @@ -20,11 +20,15 @@ struct pci_bar_info { static int command_write(struct pci_dev *dev, int offset, u16 value, void *data) { + int err; + if (!dev->is_enabled && is_enable_cmd(value)) { if (unlikely(verbose_request)) printk(KERN_DEBUG "pciback: %s: enable\n", pci_name(dev)); - pci_enable_device(dev); + err = pci_enable_device(dev); + if (err) + return err; } else if (dev->is_enabled && !is_enable_cmd(value)) { if (unlikely(verbose_request)) printk(KERN_DEBUG "pciback: %s: disable\n", @@ -44,7 +48,13 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data) printk(KERN_DEBUG "pciback: %s: enable memory-write-invalidate\n", pci_name(dev)); - pci_set_mwi(dev); + err = pci_set_mwi(dev); + if (err) { + printk(KERN_WARNING + "pciback: %s: cannot enable memory-write-invalidate (%d)\n", + pci_name(dev), err); + value &= ~PCI_COMMAND_INVALIDATE; + } } return pci_write_config_word(dev, offset, value); diff --git a/linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c b/linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c index 7d2118226b..96675a8768 100644 --- a/linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c +++ b/linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c @@ -805,6 +805,18 @@ static ssize_t permissive_show(struct device_driver *drv, char *buf) DRIVER_ATTR(permissive, S_IRUSR | S_IWUSR, permissive_show, permissive_add); +static void pcistub_exit(void) +{ + driver_remove_file(&pciback_pci_driver.driver, &driver_attr_new_slot); + driver_remove_file(&pciback_pci_driver.driver, + &driver_attr_remove_slot); + driver_remove_file(&pciback_pci_driver.driver, &driver_attr_slots); + driver_remove_file(&pciback_pci_driver.driver, &driver_attr_quirks); + driver_remove_file(&pciback_pci_driver.driver, &driver_attr_permissive); + + pci_unregister_driver(&pciback_pci_driver); +} + static int __init pcistub_init(void) { int pos = 0; @@ -845,12 +857,23 @@ static int __init pcistub_init(void) if (err < 0) goto out; - driver_create_file(&pciback_pci_driver.driver, &driver_attr_new_slot); - driver_create_file(&pciback_pci_driver.driver, - &driver_attr_remove_slot); - driver_create_file(&pciback_pci_driver.driver, &driver_attr_slots); - driver_create_file(&pciback_pci_driver.driver, &driver_attr_quirks); - driver_create_file(&pciback_pci_driver.driver, &driver_attr_permissive); + err = driver_create_file(&pciback_pci_driver.driver, + &driver_attr_new_slot); + if (!err) + err = driver_create_file(&pciback_pci_driver.driver, + &driver_attr_remove_slot); + if (!err) + err = driver_create_file(&pciback_pci_driver.driver, + &driver_attr_slots); + if (!err) + err = driver_create_file(&pciback_pci_driver.driver, + &driver_attr_quirks); + if (!err) + err = driver_create_file(&pciback_pci_driver.driver, + &driver_attr_permissive); + + if (err) + pcistub_exit(); out: return err; @@ -887,23 +910,17 @@ static int __init pciback_init(void) #endif pcistub_init_devices_late(); - pciback_xenbus_register(); + err = pciback_xenbus_register(); + if (err) + pciback_exit(); - return 0; + return err; } static void __exit pciback_cleanup(void) { pciback_xenbus_unregister(); - - driver_remove_file(&pciback_pci_driver.driver, &driver_attr_new_slot); - driver_remove_file(&pciback_pci_driver.driver, - &driver_attr_remove_slot); - driver_remove_file(&pciback_pci_driver.driver, &driver_attr_slots); - driver_remove_file(&pciback_pci_driver.driver, &driver_attr_quirks); - driver_remove_file(&pciback_pci_driver.driver, &driver_attr_permissive); - - pci_unregister_driver(&pciback_pci_driver); + pciback_exit(); } module_init(pciback_init); -- 2.30.2